From de65f878169f58926e6a30537b7a080f6afa808c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Wed, 19 Oct 2016 21:02:09 +0200 Subject: [PATCH] container: Remove reallocate_redraws --- docs/reference/gtk/gtk4-sections.txt | 1 - gtk/gtkcontainer.c | 29 ---------------------------- gtk/gtkcontainer.h | 3 --- gtk/gtkwidget.c | 8 -------- 4 files changed, 41 deletions(-) diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index 72091a924e..e0988131ba 100644 --- a/docs/reference/gtk/gtk4-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt @@ -900,7 +900,6 @@ gtk_container_check_resize gtk_container_foreach gtk_container_get_children gtk_container_get_path_for_child -gtk_container_set_reallocate_redraws gtk_container_get_focus_child gtk_container_set_focus_child gtk_container_get_focus_vadjustment diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index 95f85eafae..85fc62b1d1 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -281,7 +281,6 @@ struct _GtkContainerPrivate guint resize_handler; guint has_focus_chain : 1; - guint reallocate_redraws : 1; guint restyle_pending : 1; guint request_mode : 2; }; @@ -1603,7 +1602,6 @@ gtk_container_init (GtkContainer *container) priv = container->priv; priv->focus_child = NULL; - priv->reallocate_redraws = FALSE; } static void @@ -1706,27 +1704,6 @@ gtk_container_remove (GtkContainer *container, g_object_unref (container); } -/** - * gtk_container_set_reallocate_redraws: - * @container: a #GtkContainer - * @needs_redraws: the new value for the container’s @reallocate_redraws flag - * - * Sets the @reallocate_redraws flag of the container to the given value. - * - * Containers requesting reallocation redraws get automatically - * redrawn if any of their children changed allocation. - * - * Deprecated: 3.14: Call gtk_widget_queue_draw() in your size_allocate handler. - **/ -void -gtk_container_set_reallocate_redraws (GtkContainer *container, - gboolean needs_redraws) -{ - g_return_if_fail (GTK_IS_CONTAINER (container)); - - container->priv->reallocate_redraws = needs_redraws ? TRUE : FALSE; -} - static gboolean gtk_container_needs_idle_sizer (GtkContainer *container) { @@ -3359,12 +3336,6 @@ gtk_container_propagate_draw (GtkContainer *container, cairo_restore (cr); } -gboolean -_gtk_container_get_reallocate_redraws (GtkContainer *container) -{ - return container->priv->reallocate_redraws; -} - /** * gtk_container_get_path_for_child: * @container: a #GtkContainer diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h index aa59f4f273..37af1ea198 100644 --- a/gtk/gtkcontainer.h +++ b/gtk/gtkcontainer.h @@ -157,9 +157,6 @@ void gtk_container_unset_focus_chain (GtkContainer *container); /* Widget-level methods */ -GDK_DEPRECATED_IN_3_14 -void gtk_container_set_reallocate_redraws (GtkContainer *container, - gboolean needs_redraws); GDK_AVAILABLE_IN_ALL void gtk_container_set_focus_child (GtkContainer *container, GtkWidget *child); diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 4a27e36bee..df6c2bd3c9 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -5599,14 +5599,6 @@ gtk_widget_size_allocate_with_baseline (GtkWidget *widget, } } - if ((size_changed || position_changed || baseline_changed) && priv->parent && - _gtk_widget_get_realized (priv->parent) && _gtk_container_get_reallocate_redraws (GTK_CONTAINER (priv->parent))) - { - cairo_region_t *invalidate = cairo_region_create_rectangle (&priv->parent->priv->clip); - gtk_widget_invalidate_widget_windows (priv->parent, invalidate); - cairo_region_destroy (invalidate); - } - out: if (priv->alloc_needed_on_child) gtk_widget_ensure_allocate (widget); -- 2.30.2